Don't overwrite all of CFLAGS/CXXFLAGS in prometheus-cpp build #111
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timwoj
force-pushed
the
topic/timw/pic-prometheus-cpp
branch
from
4b8f3a5
to
6b5845d
Compare
timwoj
changed the title
|
@0xxon This is ready for review now |
|
I also tested this on a Fedora 40 VM with all of the environment variables set as if I running the build on OBS. It passed the build and all of the tests. |
|
I think this fixes the build failure on oss-fuzz as well. I ran a local build against the branch and it all linked correctly. |
ckreibich
approved these changes
Jun 7, 2024
We only really care about the -DDEBUG flag. We need to pass other flags down from various builds such as the binary builds on OBS.
timwoj
force-pushed
the
topic/timw/pic-prometheus-cpp
branch
from
6b5845d
to
16a7722
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The old code overwrote CFLAGS/CXXFLAGS entirely, which removed all of the flags needed for some of the binary builds. This ensures that those flags persist, minus the one flag that was causing problems with civetweb.
Fixes zeek/zeek#3764